Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix setup issues for Roslyn insertion #1657

Merged
merged 5 commits into from
Oct 26, 2016
Merged

Fix setup issues for Roslyn insertion #1657

merged 5 commits into from
Oct 26, 2016

Conversation

OmarTawfik
Copy link
Contributor

Fixes #1655
Fixes #1654

  • Provided an application path for NGENed binaries, and fixed app.config redirections for TypeProviders and ValueTuples dependencies.
  • Fixed NGENing fsc/fsi as x86 applications.

@Microsoft/fsharp-compiler

@@ -59,7 +59,4 @@
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" AssemblyName="|FSharp.Editor;AssemblyName|" />
<Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" />
</Assets>
<Prerequisites>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we removing these?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was needed for a local setup issue by Kevin, but it is failing building in willow for now. Discussed it with @KevinRansom we removed the dependency as it is not required ATM.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These will be required to build with RC builds of VS "15" btw.

<package id="WiX.Toolset.2015" version="3.10.0.1503" />
<package id="Microsoft.VisualFSharp.Core.Redist" version="1.0.0" />
<package id="Microsoft.VisualStudio.Shell.14.0" version="14.3.25407" targetFramework="net46" />
<package id="Microsoft.VisualFSharp.Msbuild.15.0" version="1.0.1" />
<package id="System.ValueTuple" version="4.0.0-rc3-24212-01" />
<package id="Microsoft.VisualFSharp.Type.Providers.Redist" version="1.0.0" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see this as part of the change?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this because you moved it here from vs-integration?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved. These are not needed in vsintegration. Only used in setup.

<bindingRedirect
oldVersion="2.0.0.0-4.4.1.0"
newVersion="4.0.0.0"/>
</dependentAssembly>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this related to the bug above?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Needed so that NGEN can load the correct dependencies.

publicKeyToken="b03f5f7f11d50a3a"
culture="neutral"/>
<bindingRedirect
oldVersion="2.0.0.0-4.4.1.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think value tuple needs this binding redirect. In the future it may need one. but not right now.

@@ -12,6 +12,15 @@
oldVersion="2.0.0.0-4.4.1.0"
newVersion="4.4.1.0"/>
</dependentAssembly>
<dependentAssembly>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Value tuple shouldn't need a binding redirect.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@KevinRansom We are referencing version 4.0.0.0, so fsc shouldn't be affected by this change. BUT this is needed for NGEN. Do you have concerns for adding this redirection here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discussed offline. We can get rid of the dependency.

@OmarTawfik OmarTawfik changed the title Update Setup Authoring to SwixBuild 1.0.74 Fix setup issues for Roslyn insertion Oct 25, 2016
@KevinRansom KevinRansom merged commit 5b4d5c9 into dotnet:master Oct 26, 2016
@OmarTawfik OmarTawfik deleted the fixsetup branch October 26, 2016 19:04
nosami pushed a commit to xamarin/visualfsharp that referenced this pull request Jan 26, 2022
* Remove prequesities from vsix manifests

* Fix dotnet#1655 - Upgrade to SwixBuild plugin version 1.0.71

* Fix dotnet#1654 - FSharp Binaries installed reference wrong versions

* Bring back language service registration

* Remove System.ValueTuple binding redirection
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade to SwixBuild plugin version 1.0.71 FSharp Binaries installed reference wrong versions
4 participants